auto upstream
authorJoakim Verona <joakim@verona.se>
Sun, 16 Dec 2012 03:26:54 +0000 (04:26 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 16 Dec 2012 03:26:54 +0000 (04:26 +0100)

Trivial merge